Regulator added, clean up in analysis creation.