Usage refactor