Change way map params are parsed