total refactor of usage system