Add exclude and external options