prepare for next development iteration
IAM-580 Improve role assignment
IAM-604 Fix data list model