Schema changes for #52