Added field name/type query and return