Improved internal data passing, exposure

Dubbing removal of 'base' as data on 'target'.