Server Structure Updated