real refact for composer