Reorganised class members