BalajiN | #77 | Fixing property lookup