Add view
Fix query return to return value
Add method
Refactoring