Added new options for www