Updated signature to handle map special forms