Added data-mode (in progress)