Allow options to also define default
Change to use a List to store