More generic map selection