Added Parcel annotation and supporting classes