[+] More matrix support