Chanel model refactoring