- added complex constraints and fixed role groups