Updated php structure