Fix repository
Add membership functionality