First attempt at removing the DataView