Using the new states endpoint instead of a custom one. Mentioned in #99