Fixed API to be a hash of hashes