Add Map constructor support