Added basic data binding and unit modulation