API and m5nr updates