Moved to a separate namespace. Upgraded to v3.2.0