Matrix Lib remember to fix types