BalajiN | #77 | Fixing properties init