Add Class 3 and new codes