[API] Add a warp api, with future 3.x support :: minor cleanup