Add better accounting