Refactoring webservice -> common