Merged in header format changes and interface expansion.