Added some field handling