Updated Server handler