Change configuration order for more readbility