Variablize remaining classes