Added stop service
Added handler instead of alarm manager