Updates based on new SMatrix features