Refactored Wrapper classes