added more structured types