Fixed maps, and trying to add permissions