Updated Builders to support all responders
Updated builder to fill all responders