[#30] Added validations