Changes to define classes p2