Improve default model handleing of serialize hook