Migrated dummy datasource to a separate class