Data mapping
Added dragndrop support (yet not functional)