Added orientation and connect options.