Adding support for access control headers