Added a receiver and made changes to service