Added ability to define fields speficially