Working on factory for response

Added Via, Contact and other fixes