Add serviceManager integration