Fix of DataStore key generation
Refactoring to avoid duplicate declarations side-effects in JavaScript