Add schema version check and improve time grains logic

Add schema version check and improve time grains logic #5870