Improved property sources