Martin, why do you need a new class for this? Isn't Definitions itself a class that can be discarded with context holding it.