Updated with new options