Added TargetableAttributes/modified targetable/ implemented more methods in unit