Moved accessors to cpp file