Expanded class hierarchy of Formula