Improved validations for task model