Add ExtraContextMixin