Partially return hash with symbol keys instead of string keys. Not sure about the side effects of older methods
Now uses hash with symbol keys as return values. Previously, the return values are hashes with string keys.
Merge branch 'qa'