Made files & webservice dynamic, added arguments