Converted all supported software to new mechanism