Minors changes, added webservice