Improve schema