Updated to add serializers