Added serializable flag