Change server to seperate handle