Fix issues with finding the key
Add support for units
Add support for boolean type