Refactoring units (using inheritence)