Parcelable Issues, More fixes to Add Roles