Adaptation to the new tooflya framework.