Added new wrapper by Magico