Align with web service