Initial Matrix support by vpeter