Updating Wrapper implementation