Continue porting to old class system