annotate, add validations