[WIP] Add scoping option