Updated demo server to be more robust