Refactoring to common base