This doesn't need to be Serializable anymore.