improved schemas.