Added handle for repeating record