Add validation to call back functions