API revamp