Working on 10.x+ compat & adding requests functionality