Add Generator project, minor mapping changes