Moved stuff to config