Updated membership to use custom user entity