Minor update. Adding some accessors and parameterized fields.