Added ability to define public services