Added Server desigin