Added functionality to store options