Fixed Serializable requirement