Fixed service references
Fixed conflicts