Updated M2M functionality.