Property observer has been refactored