Change how serialization works
Merge branch 'development-selector-section' into development