Add support for properties with virtual data source