Improved headers handling
Fixed push finishing by extending interface