Refactor to original Laravel classes