new models

added users and more constraints