added extra parameters to generic map