Adapt Live core to work with the refactored framework