Misc changes
Separated Map features out into separate array