Started on datasource factory
added new visitor to gether all datasources