Added support for additional config