added user and client identification