Use containeraware where possible

Supports scopes, not really used though. Don't think there is much need anyway