Locked down public types that should have been internal
Replaced explicit ContextBundle usage with an interface