Added the classes to facilitate randomisation.