Headers update
Code improvement