Added record handling