Added user and Resource Query