Wrapper Refactored