Adds initial support for maps