Updated with latest Laravel changes