Changed handling of inserts