fixed generator to work with generic property collection