Refactor edison to use new adaptor interface