Added on demand support to other paths in preview api