Add Compact headers support + solve bug