Feature/add composition section