Added additional classes