added additional classes for the static variant