added the CRS from base lookup data and some performance optimizations