Updated to support Laravel