Fix after class reorganisation