Started conversion to OOP wrapper [skip ci]