DI: properties of ServiceDefinition & Statement changed to private, added getters & setters