Added data structure expectations