Cleaned up M/R api