added guardian fields and validations