made property values more generic