Add better response system