Updated Enumerator to use Properties