Update to new .map syntax