Updated configuration and scripts