Add channel field and adapt to schema validation