Refactored source addition to definition of terms