Change argument and validator for generic implementation