Make both classes new style