Added 'expanded' attribute