Added some handler stuff to service and deleted useless Helper