Further JORC classes added