Added support for property iterator + code cleanup