Improved container scoping