Added persistance support for other primitive types
Merge branch 'develop'