Fixed name provider and added some stuff for datatype support