Further refactor map intent handling