Increase buffer capacity
Add mapping of values
Implement default behaviour for missing values in map