Split saving event into creating/updating