Update deprecated option to scope block