Improvements to the way we handle Parcelable with regards to List and Map