Make API semi-usable