Fixes and additions

Change to "DataLine" interface