Added version checking in run time