More changes on class pathway API support