First support for entity maps
Completed Favourite maps
Improved entity maps