Updates to conform with latest Laravel 5 changes