Moved storing from connection into protocol parse