Additional changes to support LocalCoordinatesSite