Move callbacks from schema and better names