This is just to pass down the context to the datastore layer, it doesn't use it just yet - this will be in a follow-up PR.