Added User and some model validations