Change old style class to new style class