Cleanup
Added accessors for fields.
Updated parser