PHP improvements