Bugfix/data conversion

* Appropriate check for dictionary keys
* Parameter converion is all done by function