Updated to provide userId