Deleted Factory and added small DAo adapters fix