Fixed non-working map serialization, added todos
Added easy enum serialization