Minor reorganising
Added support for multiple versions