Adjust for new classes