Updated configuration and parsing