Changed Data to Serializable to fix build