Added Options handling