Added table and field variables