Added support to query user with roles