Updated to work with recent changes to the M+M library.