Removes container reference in favour of single context concept with registration and query APIs