Fixed issue where Common class was returning previous files data