Redesign for nested blocks