Refactor adapters, thing model