Added support for external config, updated framework