Updated to start fixing with latest version of Laravel