Add help messages
Add more types