Update comments
Add default scope