More modifications to make PHP more performant