Enable save states

Core now has support