Add more defaults to structures