[wip] More codez.
[minor] Protect against Object property lookups
[minor] Added the correct attribute selection