Add lazy types
Merge pull request #784 from andrerod/master

Add lazy types