Fix support for non-string keys in dictionaries

Fix support for non-string keys in dictionaries #230