Added more class initialisation stuff