Support some more options in scripts