Catalog server instead of state_store I think