Improve version and implementation support