Some refactoring and improve AISAH looks
Add support for some new map related props/functions