Improve rc api