CYKLO-927 Change constructor to work with container.