added some more types and placeholders