Bugfixes
Added universal serializer for API and store