Added validation and validation errors