Make dict in calc flat so better integrate with app