Added support for headers on Android