[#1481] Added the address field collection