Removed the dependency on the risk model parsers