reduce users patch and add properly dependencies, so clients also build