[mpora] Modernize