Redesign configuration structure