Update schemas as discussed