Updated to support illuminate/support v4.2.*