Change array structure of fields, create onUpdate event for Models