AppConfig fixed according to the next changes