remote extension merged to the core module and simplified #127