Major update to include options