Add more types of the stuff. And some places