added more Table and Field functionality