Added schema transformations for speed