Adaptation with schema refactoring + UI works