back to 1.0.0 and correct classes