- Added Iterator and Property support