Wrapper refactor