Updated the passenger wrapper so it doesn't use simpledelegate.