Added validations and method