Allow version to be specified, and ability to disable