Update stor script to handle client options