Refactor and intent service added