added basetype indication to all fields