Added passenger 4 compatibility