Setting "fallback" size + some refactoring SOAP-679