Add lazy types
Apply review feedback
Merge pull request #783 from andrerod/master

Add lazy types