Add handling the @container mapping to new term definition in the context processing algorithm... with tests.