Better organized config