Added Statespace to EvalStoreContext