Updated framework / model