Added validations, some controller actions