- Updates to work with laravel structure