Add organic flag to subscriptions
Create subscriptions earlier so we can store organic option