Fixing Service Instantiation