HH5 - introduce IoC container