Enable accounting (3/24)

Enable accounting