fixup! Make API stateless