Extensions from Accountant