Updated the lazy init