NEW: migrated various modules to the new, declarative table generation