Adding better PHP support