Fixed missing Serializable