Fix bug with properties being added to the Service base class instead of individually to each service class