Added additional cartridges support