Merged with new api header.