Update to @aroman's schema