[fix] - system.xml refactoring