Added additional idempotent datasource types.