Add accounting and integrate into client