Added options and positional classes