FIX exposure of internal data in the model