polishing source.
Reflected change in underlying object.
Added class extraction.