Removed _consolidated, added _compound