More changes for capturing curved geometries