Changes for version differences

Changes for version differences