Added DropDownProperty and EditProperty