Switched object keys back to identifiers - I was being paranoid using strings