Shouldn't we also at some point add to the context information about the xblock?