Added additional Parcelable implementations