Add additional classes missed in previous commit