Refactored Classes