Reworking on Escape App Components for migration (again)