Updated for new Map object and support for frontendInfo on them