Updated chatbuilder