Own file for select_vars
Renaming infrastructure