Undo Dynamic Calls and Reconsider BOIS Serializer