variants; default fields moved to proxy; type_map bug fix