Modernise code: module and associated class are not heritable