Adjusted model data structure to fit our current architecture