Updated with optional content.