Refactor Lager usage