Changed schemas to match front end