Lots of enhancements due to the changes in schema which is needed for the
import of json files.