Sorting out some of the usage tables