updated with local configuration and dictionary