Moved to new framework. Added guard config.