Yeah, I think in future I will decouple these two and extract this feature as a stand alone service.