Various Fix

addPolicySet()
updateAttributes()
addSubject()