Make use of lazy (#376)