Updated configuration layout