Remove factory.driver which no longer exist and add dsl instead