Adding support to User streaming