Added few other opts