Added some additional accessors