Fix enum default.
Add check for null address
Change map to use positions