Updated configuration code