Added proper accessors