Server logic added