Made serialization more lenient