Improved copying map to content