Added mechanism to handle line data