ARIES-1880 - Use builder in subscribe