Changed php structure