Added imports for new modules
Changed class name to UnderlyingTerm
Formatting