CLSN-684 code review : July 1st
CLSN-632 stakeholder : separate in factories