Added new field accessors
Fixing up views