Handler moved to ServiceHandler in the services package, added some
comments