Refactoring of all classes that uses the soap model structure