#11 adding addresstypes