[#31]Added validations