Added field class
Minor Changes