Updated to so that both arrayList and maps will deserialize correctly.