Added option passing