Refactored handling of target attribute.
Refactored handling of target attribute.

Treesaver/treesaver,bramstein/treesaver,Treesaver/treesaver,Treesaver/treesaver,bramstein/treesaver,bramstein/treesaver