Class modifications