Rearrange base class methods