Added Server class fixed duplicates