Convert options to backbone collection

Bug fix to allow change notifications to propagate.