Added legacy format