Increased version support
