Use keywords instead of key strings which is idiomatic and it simplifies the usage of map function
Removed unnecessary function which was left after string key->keyword conversion. Changed some confusing parameter names.
Merge branch 'dev'