Added EXTRA_FORMULAS to some cluster models, updated system

Change-Id: Ie0c4be21950367b7cbe02495746477b6de89a3da
3 files changed