Extract some deprecated functionality into parent class