All datasources combined with suitable handler. Further code cleanup