Adding Response more generic system