Attention:
- addKeysValues(): removed