Refactor with separate APIs
Resolved conflict