Added some more classes related to ocjp preparation