Refactor view management
Syntax change for rdoc generator