Added options to set classes