Updated Service object, should pass all tests