fix: added all validations