Better service handling and proper namespace