Changed to a TreeStore