Adapted to 2.1.0-alpha release