Some API improvements
Simplified API
Added StringMap
Some cleansing
Extracted headers