Adding new version, with enable / disable support