Use types instead of classes
Merge pull request #720 from mysema/i639

Use types instead of classes