Moved methods to baseclass