Refactored Classes and Interfaces