updated models, added user methods