Added map support to Abaddon