Added Extensions

Also promoted Extensions and Protocols to higher headers.