refactoring webservice -> common