Cleanup the framework and added more options in the config.