Replacing TV and AV objects with property maps possibly