Updated documentation, added accessors