Api rework it2