Use after commit instead of after create