Added support for m3.*,r3.* and old gen instances