Added intent
Refactored my services.