Updated to reworked v2 API