refactored entity to make it parcelable