Moved options into struct