[#1481] Updated the fields