Enable accounting (6/24)

Enable accounting