Restructure for multi-m