Updated to include new options