Added better Config system