Future calculations support. Some code reorganization. Pending test