Made version support more accurate