Update module list in README
Fix a few DataModel return types.