Improve map methods