Update docs with classes
Fix merge conflicts