Moving vars to config