Finished adding options structure