Added option to use custom DataSource