Added ability to have services and watches configured via hiera