Service implementation updated