Added missing messages and headers