Updated headers for consistency