Added 'uid' criterion