[aerogear-issues] [JBoss JIRA] (AGPUSH-1971) Update the current maps integration to a more modern maps structure