Changes to server handler in demo