Add official support for 2.1.0