Mapping fixes.
Lazy loading. Moved reflection logic to metadata class.