Add userkey tracking