#606 fixed usage context calls to stats.
#606 updated usage endpoints.
Merge pull request #607 from joola/feature/#606

#606 updated usage endpoints