Updated configuration
Latest changes