Adjustements for beyond server version