- initial work for 2.0.0 compatibility