Made adjustments to the datasource prototype to reflect all db properties