Replaced string keys with pure JS keys