Add more types and data