Moved dao factory to domain