Serialization

Hey,

Things should be a bit cleaner now.

And now it will be easier to pass additional data to the serializers.