Alignment with good version of WSO2API class