V4: 2.1 class added