Rework inside Model