refactor munna extension, proxy