Modifying usage APIs to be user based