entity saving improvements