Update wrap functions + new Scope