Fixed model serializing