Added Validation and user model