Slightly modified serializers to be a bit more flexible