Removed DataSource; updated check