Services files with new encode(to:) functions

Services files with new encode(to:) functions #1709