Kiran | #4 | Updated properties