TAJO-119: Refactor and Improve Datum. (jinho)