Moved stuff to config file