Refactor all Wrap methods