Changes for accounting, authentication