Made web service better again