Changes for lager 2.0