add support for more records, remove iterative support