Cleanup service interface, make it easier and less error prone when creating new...