Updated Config stuff