Minor Refactoring of code in PropertyBag
Updated TASKS