Updates to new database calls. Simplify schema items that are in flux to
make sure we don't get any conversion errors.