Updated models for Expandable ListView