Add a default for the server and fixed the schema for version 2