Removed Serializable check