Moving more functions from wrapper to class