Reorder some methods
Added serialization to locales for non array test model
Added example for support of non array types