added some contexts to the spec