Move variables to Config elements