Update to new sigil and maps syntax