Added Options class