Change api a bit, hopefully it serializes faster now