Integration of proximity service as separate pipeline, some adjustments and optimizations.