Issue #57 Add validations