Add defaults for easier editing