Added DataSource trait to generalise connection retrieval.