Added support for more types, building the support needed for building from a json dict