Further improving php support