Roll back to use the simple Class constructor to support class lock. Fix a bug for...