Updated to ph-commons 5.0.2