Added option to enable imports denormalization