added most of the other types