Including capacity building and gender