Some clean-ups
Add repositories and discussion method
Modify some class attributes