Changes for version differences