Added mandate support