Added headers support