CR1 migration + general refactor