Moved version checks into better file