Updaed files to work with Laravel newest version