Modifications for DataCandy.