Added helper to handle data-interchange