Changed iterators to only list direct classes and properties