Refactor dataSource options into a hash