Improve schema layout