Added a bunch more properties