Add empty (and sensible) defaults