Fixed Unit to support new attributes system/modified targetable/Added AttributeConstants class