Add serialize-with-functions