Added more defaults