master: added more configurability to the service