Moved back to web service from library