BS-9307, add version + description field and move nome to the mapping