Adopted to lib API
Adopted API
API cleansing
Extracted headers