Added more simple types