Update singleton scoping