Changed to Config-Class