Revert "Add member ship to Model state"

This reverts commit 93a6c25de40ad5babee28f42640239c6ea4beced.
Revert "Revert "Add member ship to Model state""

This reverts commit ec2434ee09f497d487c0c12bf546d2680179fad4.