Updated to new datamanger-1.3