Making it compliant with Rainbow 2.0