Migrated variables out of repo (and into class params)