Add some collection stuff
Add types