add base parcelable entity & refactoring