CAN class, various improvements