IOChannel re-factory + Cosmetics
Annotation re-factory + Cosmetics
Back to shared pool + Unit tests + Cosmetics