schema improvements