Updated membership to use surrogate key (instead of composite key)
Regenerated entity files from schema