Update to include new options