Added support of external option