Trying to make it for all services
Fixed #2
Fixed #3
Fixed #1
Merge
Returning fix of #4