added map to basic decls for type resolution