Parameterized classes and remove motd class