Refactored Classes.