Context ported to new model