More changes on pathway API implementation