Move variables to config