Correctly handle flags in absence of subscription
Handle optional fields with modifier ‘?’
misc