Addon changes.. more improving in a bit
Fix app file based on latest laravel changes