added code for compatible transition from 2.0.0