[EVENTRIC-18] Refactor Remote to support existing remote adapter