Fixed Core Services Dependency