improve schema