Schema changes, moving to enum, consolidating "info" code to one place for client and server