Added parcelable to master to save writing it later