Added support for header cells