Move the definitions of classes version inside the class itself