Fixed serializable to include the arrays