Added a few more accessor functions