WIP: adding field @fuentesdt