Add ability to just give a CF path and datasource name