No actually I think you're right, using `core.State` seems consistent with the other model files.