Adding Class 4 and updates