Added headers for 3.1