Revert "Revert "Access Changes / Map Fix #1""

This reverts commit 5d8759e2c21cfdc3726d7468a9aa4e637e8992e0.