Adding contextual validators, confide and entrust