Add pact groups, wait enhancements