Added batch arch. Updated DAO itests.