CN-24 Refactor