Refine API from scratch