Moved formula building into own class.
Add missing service injection.