Services fix, added boundary group