Factorizing some wrapper classes
Debugging scale variations