Add some more defaults