Fix #50 - updated typology