Added further JORC classes with units.