Use commit instead of save hook